Revision: tla--devo--1.3--patch-16
Archive: lord@emf.net--gnu-arch-2004
Creator: Matthew Dempsky <mdempsky@seyza.com>
Date: Mon Nov 22 08:47:09 UTC 2004
Standard-date: 2004-11-22 08:47:09 GMT
Modified-files: =merges ChangeLog libarch/apply-changeset.c
    tests/test-star-merge.sh
New-patches: lord@emf.net--gnu-arch-2004/tla--devo--1.3--patch-16
Summary: fixed diff3 --binary bug
Keywords:

Changes intended to improve win32 compatibility caused diff3 to be
invoked with --binary, when it accepts no such parameter.  This broke
star-merge --three-way.

This patch reverses the change, and includes a star-merge --three-way
test case to exercise the diff3 invocation code.  Many thanks to Aaron
Bentley for catching this regression in tla-1.3pre2.
